Make it easier to control which revisions bzrmerge might skip.
authorGlenn Morris <rgm@gnu.org>
Tue, 25 Jan 2011 05:10:02 +0000 (21:10 -0800)
committerGlenn Morris <rgm@gnu.org>
Tue, 25 Jan 2011 05:10:02 +0000 (21:10 -0800)
commit5b69dadb80a8770bd499928a72f93f0cd0faefca
treed064ce73d9f461cb0b7412787e136e118c778bd9
parentac267ba9493369185b8ca372942d4894f90e8d60
Make it easier to control which revisions bzrmerge might skip.

* admin/bzrmerge.el (bzrmerge-skip-regexp): New variable.
(bzrmerge-missing): Use it.
admin/ChangeLog
admin/bzrmerge.el